router: fix SLAAC on subnets > 64

Signed-off-by: Álvaro Fernández Rojas <[email protected]>

diff --git a/src/router.c b/src/router.c
index c5f030ad8d8a169f05a5ba166dbbcc5d0e1c171b..079a5d183fe81e80e8e7368d55a867f15f3b16ae 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -448,13 +448,13 @@ struct nd_opt_dnr_info {
 
 /* IPv6 RA PIOs */
 static struct ra_pio *router_find_ra_pio(struct interface *iface,
-       struct nd_opt_prefix_info *p)
+       struct odhcpd_ipaddr *addr)
 {
        for (size_t i = 0; i < iface->pio_cnt; i++) {
                struct ra_pio *cur_pio = &iface->pios[i];
 
-               if (p->nd_opt_pi_prefix_len == cur_pio->length &&
-                       !odhcpd_bmemcmp(&p->nd_opt_pi_prefix, &cur_pio->prefix, cur_pio->length))
+               if (addr->prefix == cur_pio->length &&
+                       !odhcpd_bmemcmp(&addr->addr.in6, &cur_pio->prefix, cur_pio->length))
                        return cur_pio;
        }
 
@@ -462,12 +462,12 @@ static struct ra_pio *router_find_ra_pio(struct interface *iface,
 }
 
 static void router_add_ra_pio(struct interface *iface,
-       struct nd_opt_prefix_info *p)
+       struct odhcpd_ipaddr *addr)
 {
        char ipv6_str[INET6_ADDRSTRLEN];
        struct ra_pio *new_pios, *pio;
 
-       pio = router_find_ra_pio(iface, p);
+       pio = router_find_ra_pio(iface, addr);
        if (pio) {
                if (pio->lifetime) {
                        pio->lifetime = 0;
@@ -490,8 +490,8 @@ static void router_add_ra_pio(struct interface *iface,
        pio = &iface->pios[iface->pio_cnt];
        iface->pio_cnt++;
 
-       memcpy(&pio->prefix, &p->nd_opt_pi_prefix, sizeof(pio->prefix));
-       pio->length = p->nd_opt_pi_prefix_len;
+       memcpy(&pio->prefix, &addr->addr.in6, sizeof(pio->prefix));
+       pio->length = addr->prefix;
        pio->lifetime = 0;
 
        iface->pio_update = true;
@@ -538,10 +538,10 @@ static void router_clear_ra_pio(time_t now,
 }
 
 static void router_stale_ra_pio(struct interface *iface,
-       struct nd_opt_prefix_info *p,
+       struct odhcpd_ipaddr *addr,
        time_t now)
 {
-       struct ra_pio *pio = router_find_ra_pio(iface, p);
+       struct ra_pio *pio = router_find_ra_pio(iface, addr);
        char ipv6_str[INET6_ADDRSTRLEN];
 
        if (!pio || pio->lifetime)
@@ -774,12 +774,12 @@ static int send_router_advert(struct interface *iface, const struct in6_addr *fr
                        p->nd_opt_pi_preferred_time = 0;
                        p->nd_opt_pi_valid_time = 0;
 
-                       router_stale_ra_pio(iface, p, now);
+                       router_stale_ra_pio(iface, addr, now);
                } else {
                        p->nd_opt_pi_preferred_time = htonl(preferred_lt);
                        p->nd_opt_pi_valid_time = htonl(valid_lt);
 
-                       router_add_ra_pio(iface, p);
+                       router_add_ra_pio(iface, addr);
                }
        }